From 9bd206a65cd7f254b3947189d18ffba371f6ca9f Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 18 Apr 2011 04:25:53 +0200
Subject: [PATCH] label: No need to special case single-line mode

It's already taken care of by the layout.
---
 gtk/gtklabel.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gtk/gtklabel.c b/gtk/gtklabel.c
index 0ef1f7f2e5..3f83745911 100644
--- a/gtk/gtklabel.c
+++ b/gtk/gtklabel.c
@@ -3559,7 +3559,7 @@ gtk_label_get_preferred_layout_size (GtkLabel *label,
   pango_layout_get_extents (layout, NULL, natural);
   natural->x = natural->y = 0;
 
-  if (priv->single_line_mode || priv->wrap)
+  if (priv->wrap)
     natural->height = get_single_line_height (GTK_WIDGET (label), layout);
 
   if (priv->ellipsize || priv->wrap)
-- 
2.30.2